diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java
index 459dcdb6..ea25e71c 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.messaging.spi;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
index 6c4560bf..ada0b4d9 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
@@ -15,7 +15,7 @@
  */
 package org.dna.mqtt.moquette.messaging.spi;
 
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.server.ServerChannel;
 
 /**
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java
index 3be8836d..99837b6f 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.messaging.spi.impl;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.server.ServerChannel;
 
 /**
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
index eefbf187..a9c15c84 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
@@ -22,7 +22,7 @@ import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
 import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
 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.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
 import org.slf4j.Logger;
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 6cecbaed..0f9f63e5 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
@@ -36,20 +36,20 @@ import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
-import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
-import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
-import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
-import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
-import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
-import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
-import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubAckMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.DisconnectMessage;
+import org.dna.mqtt.proto.messages.PubAckMessage;
+import org.dna.mqtt.proto.messages.PubCompMessage;
+import org.dna.mqtt.proto.messages.PubRecMessage;
+import org.dna.mqtt.proto.messages.PubRelMessage;
+import org.dna.mqtt.proto.messages.PublishMessage;
+import org.dna.mqtt.proto.messages.SubAckMessage;
+import org.dna.mqtt.proto.messages.SubscribeMessage;
+import org.dna.mqtt.proto.messages.UnsubAckMessage;
+import org.dna.mqtt.proto.messages.UnsubscribeMessage;
 import org.dna.mqtt.moquette.server.ConnectionDescriptor;
 import org.dna.mqtt.moquette.server.Constants;
 import org.dna.mqtt.moquette.server.IAuthenticator;
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 81f17c63..eb09f351 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
@@ -31,7 +31,7 @@ import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
 import org.dna.mqtt.moquette.messaging.spi.impl.events.*;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
 import org.dna.mqtt.moquette.messaging.spi.persistence.MapDBPersistentStore;
-import org.dna.mqtt.moquette.proto.messages.*;
+import org.dna.mqtt.proto.messages.*;
 import org.dna.mqtt.moquette.server.IAuthenticator;
 import org.dna.mqtt.moquette.server.ServerChannel;
 import org.slf4j.Logger;
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java
index 8e7f0c74..719c7b0f 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java
@@ -15,7 +15,7 @@
  */
 package org.dna.mqtt.moquette.messaging.spi.impl.events;
 
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.server.ServerChannel;
 
 /**
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java
index c9a482c0..8a457492 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java
@@ -15,8 +15,8 @@
  */
 package org.dna.mqtt.moquette.messaging.spi.impl.events;
 
-import org.dna.mqtt.moquette.proto.Utils;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.Utils;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.server.ServerChannel;
 
 /**
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java
index 6cee0313..87face45 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java
@@ -15,10 +15,9 @@
  */
 package org.dna.mqtt.moquette.messaging.spi.impl.events;
 
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
 
 import java.nio.ByteBuffer;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
 
 /**
  *
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java
index b3303862..a468e3b9 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.messaging.spi.impl.storage;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
 
 /**
  * Publish event serialized to the DB.
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java
index 4d354d4e..44b39dad 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java
@@ -16,7 +16,7 @@
 package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
 
 import java.io.Serializable;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
 
 /**
  * Maintain the information about which Topic a certain ClientID is subscribed 
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java
index a975b6e1..02d756ed 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java
@@ -16,14 +16,14 @@
 
 package org.dna.mqtt.moquette.messaging.spi.persistence;
 
-import org.dna.mqtt.moquette.MQTTException;
+import org.dna.mqtt.proto.MQTTException;
 import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
 import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
 import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
 import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
 import org.dna.mqtt.moquette.messaging.spi.impl.storage.StoredPublishEvent;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import static org.dna.mqtt.moquette.server.Server.STORAGE_FILE_PATH;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java b/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java
index 7edf2124..9455e437 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java
@@ -21,10 +21,10 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 import java.util.HashMap;
 import java.util.Map;
 import org.dna.mqtt.moquette.messaging.spi.IMessaging;
-import org.dna.mqtt.moquette.proto.Utils;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import static org.dna.mqtt.moquette.proto.messages.AbstractMessage.*;
-import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
+import org.dna.mqtt.proto.Utils;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import static org.dna.mqtt.proto.messages.AbstractMessage.*;
+import org.dna.mqtt.proto.messages.PingRespMessage;
 import org.dna.mqtt.moquette.server.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java
index 0464fdd8..1cb4c446 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java
@@ -15,8 +15,8 @@
  */
 package org.dna.mqtt.moquette.messaging.spi.impl;
 
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
 import org.dna.mqtt.moquette.server.ServerChannel;
 import static org.junit.Assert.*;
 import org.junit.Before;
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java
index ef15006d..b73c9c5a 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java
@@ -19,7 +19,7 @@ import java.io.File;
 import java.util.List;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
 import org.dna.mqtt.moquette.messaging.spi.persistence.MapDBPersistentStore;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.server.Server;
 import org.junit.After;
 import org.junit.Test;
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java
index 5fc0b9f3..cf88ce54 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java
@@ -18,7 +18,6 @@ package org.dna.mqtt.moquette.messaging.spi.impl;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,14 +29,14 @@ import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
-import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
-import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
-import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.DisconnectMessage;
+import org.dna.mqtt.proto.messages.PublishMessage;
+import org.dna.mqtt.proto.messages.SubAckMessage;
+import org.dna.mqtt.proto.messages.SubscribeMessage;
 import org.dna.mqtt.moquette.server.Constants;
 import org.dna.mqtt.moquette.server.ServerChannel;
 import static org.junit.Assert.*;
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
index facae87b..7b96a56c 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.dna.mqtt.moquette.messaging.spi.impl.MemoryStorageService;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 import static org.junit.Assert.*;
 import org.junit.Before;
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java b/broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java
index 32bf66d8..fb31c636 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java
@@ -19,10 +19,10 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
 import org.dna.mqtt.moquette.testclient.Client;
 import org.fusesource.mqtt.client.BlockingConnection;
 import org.fusesource.mqtt.client.MQTT;
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java b/broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java
index 42ecc88d..a105ac95 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java
@@ -24,11 +24,10 @@ import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
-import java.util.concurrent.Callable;
 import org.dna.mqtt.commons.Constants;
 import org.dna.mqtt.moquette.parser.netty.MQTTDecoder;
 import org.dna.mqtt.moquette.parser.netty.MQTTEncoder;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java b/broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java
index fe404810..60bff732 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.testclient;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.dna.mqtt.moquette.proto.Utils;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.Utils;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.server.netty.NettyMQTTHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 0444d4e0..98cc5718 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -189,7 +189,7 @@
                             <!--org.apache.commons.logging,-->
                             <!--org.dna.mqtt.moquette.messaging.spi.impl.storage,-->
                             <!--org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,-->
-                            org.dna.mqtt.moquette.proto.messages.*,
+                            org.dna.mqtt.proto.messages.*,
                             org.dna.mqtt.moquette.server.netty.metrics
                         </Export-Package>
                         <Private-Package>org.dna.mqtt.moquette.bundle,
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java
index c57b528e..00347e4a 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java
@@ -3,7 +3,7 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java
index 41ef0c56..a92ce8c3 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
index e79658d2..4d175c6a 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java
@@ -16,7 +16,6 @@
 package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
@@ -25,8 +24,8 @@ import java.io.UnsupportedEncodingException;
 import java.util.List;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java
index 7e27923d..727017d6 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java
index e422af4d..2e6bf7da 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java
index ce882abe..b26ce3fc 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java
@@ -17,7 +17,7 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java
index 90f6757a..63b34a07 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
+import org.dna.mqtt.proto.messages.DisconnectMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java
index 3779fff5..c65bf290 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.DisconnectMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java
index 0bfbdf87..94c69cdb 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java
@@ -23,7 +23,7 @@ import io.netty.util.AttributeKey;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java
index 32fcb1ff..a5ef95dd 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java
@@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.MessageToByteEncoder;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java
index 3af7ec68..292e2e1c 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
+import org.dna.mqtt.proto.messages.MessageIDMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java
index 87dcf8f1..d6f65c7c 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
+import org.dna.mqtt.proto.messages.PingReqMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java
index 22f65ca7..0fa14211 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PingReqMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java
index 8ee6c3fe..fb287109 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
+import org.dna.mqtt.proto.messages.PingRespMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java
index e84d07c7..c2c57189 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PingRespMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java
index cf101ce0..8d67e4ea 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java
@@ -15,8 +15,8 @@
  */
 package org.dna.mqtt.moquette.parser.netty;
 
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
-import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
+import org.dna.mqtt.proto.messages.MessageIDMessage;
+import org.dna.mqtt.proto.messages.PubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java
index 5893b7f2..7acd5e16 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java
index cdbaa833..bb467f7c 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java
@@ -15,8 +15,8 @@
  */
 package org.dna.mqtt.moquette.parser.netty;
 
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
-import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
+import org.dna.mqtt.proto.messages.MessageIDMessage;
+import org.dna.mqtt.proto.messages.PubCompMessage;
 
 
 /**
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java
index 562da9f7..07b0866a 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PubCompMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java
index fe0975da..4a5c7d7a 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java
@@ -15,8 +15,8 @@
  */
 package org.dna.mqtt.moquette.parser.netty;
 
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
-import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
+import org.dna.mqtt.proto.messages.MessageIDMessage;
+import org.dna.mqtt.proto.messages.PubRecMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java
index b1af2ae6..ce788133 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PubRecMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java
index 934fe6b6..b90bc767 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
-import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
+import org.dna.mqtt.proto.messages.MessageIDMessage;
+import org.dna.mqtt.proto.messages.PubRelMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java
index 75b1aff8..7fd3cef4 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PubRelMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java
index c22d203e..e06449b7 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java
@@ -17,12 +17,11 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PublishMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java
index 6433aefa..35191047 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PublishMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java
index b8d26945..52a2294d 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java
index 775e156a..e1d5fd3b 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java
index 4cdd6704..e87de46c 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java
@@ -20,8 +20,8 @@ import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.SubscribeMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java
index efcec793..bd2c1039 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubscribeMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java
index a6391243..eaaf5e33 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java
@@ -15,8 +15,8 @@
  */
 package org.dna.mqtt.moquette.parser.netty;
 
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubAckMessage;
+import org.dna.mqtt.proto.messages.MessageIDMessage;
+import org.dna.mqtt.proto.messages.UnsubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java
index c1b13002..16293855 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.UnsubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java
index a5f79aee..d9e0a450 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.UnsubscribeMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java
index e59e3bd4..9d24472b 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.UnsubscribeMessage;
 
 
 /**
diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java
index 684312b1..3a300591 100644
--- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java
+++ b/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java
@@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java
index 6e8a8451..86cacb8a 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java
index a8ae1700..b7fb2de5 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java
@@ -20,7 +20,7 @@ import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
+import org.dna.mqtt.proto.messages.ConnAckMessage;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java
index 75c79abf..3527700e 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.List;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1;
 import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java
index fe6dae6f..4bdf3a6d 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
+import org.dna.mqtt.proto.messages.ConnectMessage;
 import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java
index a6f7abe4..8a971dcf 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PubAckMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java
index 4cf6eb7a..6b95b182 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
 import static org.dna.mqtt.moquette.parser.netty.TestUtils.*;
-import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
+import org.dna.mqtt.proto.messages.PubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java
index ace52875..7970a0d0 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java
@@ -22,7 +22,7 @@ import io.netty.util.AttributeMap;
 import io.netty.util.DefaultAttributeMap;
 import java.util.ArrayList;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.Before;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java
index cda125fe..2bf3c032 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java
@@ -24,8 +24,8 @@ import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.PublishMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java
index d21865af..29009669 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java
@@ -23,8 +23,8 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.dna.mqtt.moquette.parser.netty.TestUtils.*;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.moquette.proto.messages.PublishMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.dna.mqtt.proto.messages.PublishMessage;
 
 /**
  *
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java
index 285614d5..21d2db23 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubAckMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java
index 8e5bfdb9..db5feab6 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import static org.dna.mqtt.moquette.parser.netty.TestUtils.mockChannelHandler;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubAckMessage;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java
index 35b656f8..a78d5377 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java
@@ -20,8 +20,8 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
 import java.util.ArrayList;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubscribeMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java
index 8be861c8..7d5eb749 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.SubscribeMessage;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java
index 11421e3c..a7b54e66 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java
@@ -21,8 +21,8 @@ import io.netty.handler.codec.CorruptedFrameException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.UnsubscribeMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java
index 62301ac8..8eaf0181 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.UnsubscribeMessage;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java
index 51066e97..b123e543 100644
--- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java
+++ b/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java
@@ -22,8 +22,8 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.dna.mqtt.moquette.parser.netty.TestUtils.*;
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.dna.mqtt.proto.messages.UnsubscribeMessage;
 
 /**
  *
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
index cd272fd1..259f90a6 100644
--- a/parser_commons/pom.xml
+++ b/parser_commons/pom.xml
@@ -6,7 +6,7 @@
         <relativePath>../</relativePath>
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
+        <groupId>org.eclipse.moquette</groupId>
         <version>0.7-SNAPSHOT</version>
     </parent>
 
@@ -53,16 +53,16 @@
                 </configuration>
             </plugin>
             
-            <plugin>
+            <!--plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
+                        <exclude>org/eclipse/moquette/proto/TestUtils.java</exclude>
+                        <exclude>org/eclipse/moquette/proto/TestUtils$*</exclude>
                     </excludes>
                 </configuration>
-            </plugin>
+            </plugin-->
 
         </plugins>
     </build>
diff --git a/parser_commons/src/main/java/org/dna/mqtt/commons/Constants.java b/parser_commons/src/main/java/org/eclipse/eclipse/commons/Constants.java
similarity index 95%
rename from parser_commons/src/main/java/org/dna/mqtt/commons/Constants.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/commons/Constants.java
index dbe9c0ab..47f209fd 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/commons/Constants.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/commons/Constants.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.commons;
+package org.eclipse.moquette.commons;
 
 /**
  * Contains some useful constants.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/MQTTException.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/MQTTException.java
similarity index 96%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/MQTTException.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/MQTTException.java
index 7e7d274e..6cf3fe2b 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/MQTTException.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/MQTTException.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette;
+package org.eclipse.moquette.proto;
 
 /**
  *
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/Utils.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/Utils.java
similarity index 95%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/Utils.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/Utils.java
index 6e0812f0..798bdd1f 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/Utils.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/Utils.java
@@ -13,9 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto;
+package org.eclipse.moquette.proto;
 
-import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 /**
  * Common utils methodd used in codecs.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/AbstractMessage.java
similarity index 98%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/AbstractMessage.java
index ff889e88..659ca330 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/AbstractMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Basic abstract message for all MQTT protocol messages.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnAckMessage.java
similarity index 97%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnAckMessage.java
index 7b898452..9f60126e 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * The attributes Qos, Dup and Retain aren't used.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnectMessage.java
similarity index 98%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnectMessage.java
index 3cf7c683..8f3ccc32 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnectMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * The attributes Qos, Dup and Retain aren't used for Connect message
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/DisconnectMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/DisconnectMessage.java
index 7eb96211..7fb059dd 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/DisconnectMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Doesn't care DUP, QOS and RETAIN flags.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/MessageIDMessage.java
similarity index 95%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/MessageIDMessage.java
index 20eeb5e5..150f59d4 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/MessageIDMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Base class for alla the messages that carries only MessageID. (PUBACK, PUBREC,
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingReqMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingReqMessage.java
index 2ad254d4..d83345c3 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingReqMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Doesn't care DUP, QOS and RETAIN flags.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingRespMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingRespMessage.java
index e81794e9..76af3635 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingRespMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Doesn't care DUP, QOS and RETAIN flags.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubAckMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubAckMessage.java
index 85a172f6..fc2a35fd 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Placeholder for PUBACK message.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubCompMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubCompMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubCompMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubCompMessage.java
index f5ee19b2..a3ba03bf 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubCompMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubCompMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  *
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRecMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRecMessage.java
index fc7e6b91..59b781d3 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRecMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  * Placeholder for PUBREC message.
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRelMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRelMessage.java
index 309de422..e79850d2 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRelMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  *
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PublishMessage.java
similarity index 96%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PublishMessage.java
index d74ee9c1..bb8f1bf9 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PublishMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 import java.nio.ByteBuffer;
 
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubAckMessage.java
similarity index 95%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubAckMessage.java
index 0934f0f0..5a14b0fc 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubscribeMessage.java
similarity index 97%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubscribeMessage.java
index 29f8aa0a..084c6616 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubscribeMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubAckMessage.java
similarity index 94%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubAckMessage.java
index eae5c224..060dc7be 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  *
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubscribeMessage.java
similarity index 95%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubscribeMessage.java
index c608ac01..b503fcce 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubscribeMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ZeroLengthMessage.java
similarity index 93%
rename from parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
rename to parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ZeroLengthMessage.java
index 47e68cea..d3f756c5 100644
--- a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
+++ b/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ZeroLengthMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.proto.messages;
+package org.eclipse.moquette.proto.messages;
 
 /**
  *
diff --git a/pom.xml b/pom.xml
index 43e3e61a..eb07919a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <mina-version>2.0.7</mina-version>
     </properties>
     
-    <groupId>org.dna.mqtt</groupId>
+    <groupId>org.eclipse.moquette</groupId>
     <artifactId>moquette-parent</artifactId>
 
     <packaging>pom</packaging>