diff --git a/broker/src/main/java/io/moquette/interception/InterceptHandler.java b/broker/src/main/java/io/moquette/interception/InterceptHandler.java
index 146471c0..397baf3f 100644
--- a/broker/src/main/java/io/moquette/interception/InterceptHandler.java
+++ b/broker/src/main/java/io/moquette/interception/InterceptHandler.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.interception;
 
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
 import io.moquette.interception.messages.InterceptConnectMessage;
 import io.moquette.interception.messages.InterceptDisconnectMessage;
diff --git a/broker/src/main/java/io/moquette/interception/Interceptor.java b/broker/src/main/java/io/moquette/interception/Interceptor.java
index 13f54799..47214112 100644
--- a/broker/src/main/java/io/moquette/interception/Interceptor.java
+++ b/broker/src/main/java/io/moquette/interception/Interceptor.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.interception;
 
-import io.moquette.proto.messages.ConnectMessage;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
 
 /**
diff --git a/broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java
index 88a4b136..3fd452ca 100644
--- a/broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java
+++ b/broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.interception.messages;
 
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  * @author Wagner Macedo
diff --git a/broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java
index 17333ac5..53ab3d5d 100644
--- a/broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java
+++ b/broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java
@@ -1,6 +1,6 @@
 package io.moquette.interception.messages;
 
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 
 /**
  * @author Wagner Macedo
diff --git a/broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java
index 8dae3783..da9c462e 100644
--- a/broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java
+++ b/broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java
@@ -1,6 +1,6 @@
 package io.moquette.interception.messages;
 
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 
 import java.nio.ByteBuffer;
 
diff --git a/broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java
index 8f0dab09..8f90256b 100644
--- a/broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java
+++ b/broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java
@@ -1,6 +1,6 @@
 package io.moquette.interception.messages;
 
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
 
 /**
diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java
index 39c216af..92538f39 100644
--- a/broker/src/main/java/io/moquette/server/Server.java
+++ b/broker/src/main/java/io/moquette/server/Server.java
@@ -17,7 +17,7 @@ package io.moquette.server;
 
 import io.moquette.BrokerConstants;
 import io.moquette.interception.InterceptHandler;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.server.config.MemoryConfig;
 import io.moquette.spi.impl.SimpleMessaging;
 import io.moquette.server.config.FilesystemConfig;
diff --git a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
index 97b1b016..5609f530 100644
--- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
+++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
@@ -16,7 +16,7 @@
 package io.moquette.server.netty;
 
 import io.moquette.BrokerConstants;
-import io.moquette.commons.Constants;
+import io.moquette.parser.commons.Constants;
 import io.moquette.parser.netty.MQTTDecoder;
 import io.moquette.parser.netty.MQTTEncoder;
 import io.moquette.spi.security.ISslContextCreator;
diff --git a/broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java b/broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java
index 05dd4112..f2edcda7 100644
--- a/broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java
+++ b/broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.server.netty;
 
-import io.moquette.proto.Utils;
-import io.moquette.proto.messages.*;
+import io.moquette.parser.proto.Utils;
+import io.moquette.parser.proto.messages.*;
 import io.moquette.spi.impl.ProtocolProcessor;
-import static io.moquette.proto.messages.AbstractMessage.*;
+import static io.moquette.parser.proto.messages.AbstractMessage.*;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
diff --git a/broker/src/main/java/io/moquette/spi/ClientSession.java b/broker/src/main/java/io/moquette/spi/ClientSession.java
index 2be43456..8fb53d63 100644
--- a/broker/src/main/java/io/moquette/spi/ClientSession.java
+++ b/broker/src/main/java/io/moquette/spi/ClientSession.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.spi;
 
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
 import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
 import io.moquette.spi.ISessionsStore.ClientTopicCouple;
diff --git a/broker/src/main/java/io/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java
index 34ce5ecd..6845c6b9 100644
--- a/broker/src/main/java/io/moquette/spi/IMessagesStore.java
+++ b/broker/src/main/java/io/moquette/spi/IMessagesStore.java
@@ -17,7 +17,7 @@ package io.moquette.spi;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java b/broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java
index 4274f806..890cb831 100644
--- a/broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java
@@ -18,9 +18,9 @@ package io.moquette.spi.impl;
 import io.moquette.interception.InterceptHandler;
 import io.moquette.interception.Interceptor;
 import io.moquette.interception.messages.*;
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
index a16d2826..c8c730de 100644
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
@@ -33,19 +33,19 @@ import io.moquette.spi.impl.subscriptions.Subscription;
 
 import static io.moquette.parser.netty.Utils.VERSION_3_1;
 import static io.moquette.parser.netty.Utils.VERSION_3_1_1;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.AbstractMessage.QOSType;
-import io.moquette.proto.messages.ConnAckMessage;
-import io.moquette.proto.messages.ConnectMessage;
-import io.moquette.proto.messages.PubAckMessage;
-import io.moquette.proto.messages.PubCompMessage;
-import io.moquette.proto.messages.PubRecMessage;
-import io.moquette.proto.messages.PubRelMessage;
-import io.moquette.proto.messages.PublishMessage;
-import io.moquette.proto.messages.SubAckMessage;
-import io.moquette.proto.messages.SubscribeMessage;
-import io.moquette.proto.messages.UnsubAckMessage;
-import io.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.PubAckMessage;
+import io.moquette.parser.proto.messages.PubCompMessage;
+import io.moquette.parser.proto.messages.PubRecMessage;
+import io.moquette.parser.proto.messages.PubRelMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.SubAckMessage;
+import io.moquette.parser.proto.messages.SubscribeMessage;
+import io.moquette.parser.proto.messages.UnsubAckMessage;
+import io.moquette.parser.proto.messages.UnsubscribeMessage;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.timeout.IdleStateHandler;
diff --git a/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java
index e9965d3d..cca2b1af 100644
--- a/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java
+++ b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java
@@ -16,7 +16,7 @@
 package io.moquette.spi.impl.subscriptions;
 
 import java.io.Serializable;
-import io.moquette.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
 import io.moquette.spi.ISessionsStore.ClientTopicCouple;
 
 /**
diff --git a/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java
index 45ecfedc..fe153042 100644
--- a/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java
+++ b/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java
@@ -19,7 +19,7 @@ package io.moquette.spi.persistence;
 import io.moquette.server.config.IConfig;
 import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.ISessionsStore;
-import io.moquette.proto.MQTTException;
+import io.moquette.parser.proto.MQTTException;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
 import org.slf4j.Logger;
diff --git a/broker/src/test/java/io/moquette/server/ServerIntegrationEmbeddedPublishTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationEmbeddedPublishTest.java
index 8d10567b..5648496c 100644
--- a/broker/src/test/java/io/moquette/server/ServerIntegrationEmbeddedPublishTest.java
+++ b/broker/src/test/java/io/moquette/server/ServerIntegrationEmbeddedPublishTest.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.server;
 
-import io.moquette.proto.messages.AbstractMessage.QOSType;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.config.MemoryConfig;
 import org.fusesource.mqtt.client.*;
diff --git a/broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java b/broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java
index 7f9a85f1..08b10767 100644
--- a/broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java
+++ b/broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.server;
 
-import io.moquette.proto.messages.ConnectMessage;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.AbstractMessage.QOSType;
-import io.moquette.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.ConnAckMessage;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.config.MemoryConfig;
 import io.moquette.testclient.Client;
diff --git a/broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java b/broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java
index 9f2901de..1ade4212 100644
--- a/broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java
+++ b/broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java
@@ -16,10 +16,10 @@
 package io.moquette.spi.impl;
 
 import io.moquette.interception.messages.*;
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 import io.moquette.interception.InterceptHandler;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java b/broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java
index ea6b6e8d..d563c620 100644
--- a/broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java
+++ b/broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java
@@ -15,7 +15,7 @@
  */package io.moquette.spi.impl;
 
 import io.netty.util.AttributeKey;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/broker/src/test/java/io/moquette/spi/impl/NettyChannelAssertions.java b/broker/src/test/java/io/moquette/spi/impl/NettyChannelAssertions.java
index 9ec5dd06..17881f6e 100644
--- a/broker/src/test/java/io/moquette/spi/impl/NettyChannelAssertions.java
+++ b/broker/src/test/java/io/moquette/spi/impl/NettyChannelAssertions.java
@@ -15,12 +15,11 @@
  */
 package io.moquette.spi.impl;
 
-import io.moquette.proto.messages.ConnAckMessage;
-import io.moquette.proto.messages.SubAckMessage;
-import io.netty.channel.Channel;
+import io.moquette.parser.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.SubAckMessage;
 import io.netty.channel.embedded.EmbeddedChannel;
 
-import static io.moquette.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
+import static io.moquette.parser.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
index db605690..0cd1f1e1 100644
--- a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
+++ b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
@@ -15,9 +15,9 @@
  */
 package io.moquette.spi.impl;
 
-import io.moquette.proto.messages.*;
+import io.moquette.parser.proto.messages.*;
 import io.moquette.interception.InterceptHandler;
-import io.moquette.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
 import io.moquette.server.ConnectionDescriptor;
 import io.moquette.server.netty.NettyUtils;
 import io.moquette.spi.ClientSession;
diff --git a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
index f8d94203..17692691 100644
--- a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
+++ b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
@@ -15,9 +15,9 @@
  */
 package io.moquette.spi.impl;
 
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.ConnectMessage;
-import io.moquette.proto.messages.SubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.SubscribeMessage;
 import io.moquette.server.netty.NettyUtils;
 import io.moquette.spi.ClientSession;
 import io.moquette.spi.IMessagesStore;
@@ -33,9 +33,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static io.moquette.parser.netty.Utils.VERSION_3_1_1;
-import static io.moquette.proto.messages.ConnAckMessage.BAD_USERNAME_OR_PASSWORD;
-import static io.moquette.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
-import static io.moquette.proto.messages.ConnAckMessage.UNNACEPTABLE_PROTOCOL_VERSION;
+import static io.moquette.parser.proto.messages.ConnAckMessage.BAD_USERNAME_OR_PASSWORD;
+import static io.moquette.parser.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
+import static io.moquette.parser.proto.messages.ConnAckMessage.UNNACEPTABLE_PROTOCOL_VERSION;
 import static io.moquette.spi.impl.NettyChannelAssertions.assertEqualsConnAck;
 import static io.moquette.spi.impl.NettyChannelAssertions.assertEqualsSubAck;
 import static org.junit.Assert.assertFalse;
diff --git a/broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java b/broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java
index f6d52fe4..d21103fb 100644
--- a/broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java
+++ b/broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java
@@ -24,7 +24,7 @@ import io.moquette.spi.ClientSession;
 import io.moquette.spi.ISessionsStore;
 import io.moquette.spi.ISessionsStore.ClientTopicCouple;
 import io.moquette.spi.impl.MemoryStorageService;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 import static org.junit.Assert.*;
 import org.junit.Before;
diff --git a/broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java b/broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java
index 58aed9c5..a943a65d 100644
--- a/broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java
+++ b/broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java
@@ -23,7 +23,7 @@ import io.moquette.spi.ClientSession;
 import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.ISessionsStore;
 import io.moquette.spi.ISessionsStore.ClientTopicCouple;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
 import org.junit.After;
 import org.junit.Before;
diff --git a/broker/src/test/java/io/moquette/testclient/Client.java b/broker/src/test/java/io/moquette/testclient/Client.java
index 89b57234..5635b001 100644
--- a/broker/src/test/java/io/moquette/testclient/Client.java
+++ b/broker/src/test/java/io/moquette/testclient/Client.java
@@ -27,7 +27,7 @@ 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 io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java b/broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java
index b4a0bf2f..6b78f2da 100644
--- a/broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java
+++ b/broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java
@@ -15,11 +15,11 @@
  */
 package io.moquette.testclient;
 
-import io.moquette.proto.Utils;
+import io.moquette.parser.proto.Utils;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.server.netty.NettyMQTTHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java b/embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java
index be307f87..91446d35 100644
--- a/embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java
+++ b/embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java
@@ -18,8 +18,8 @@ package io.moquette.testembedded;
 import io.moquette.interception.AbstractInterceptHandler;
 import io.moquette.interception.InterceptHandler;
 import io.moquette.interception.messages.*;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.server.Server;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.config.ClasspathConfig;
diff --git a/parser_commons/src/main/java/io/moquette/commons/Constants.java b/netty_parser/src/main/java/io/moquette/parser/commons/Constants.java
similarity index 95%
rename from parser_commons/src/main/java/io/moquette/commons/Constants.java
rename to netty_parser/src/main/java/io/moquette/parser/commons/Constants.java
index 508053e4..19114cfb 100644
--- a/parser_commons/src/main/java/io/moquette/commons/Constants.java
+++ b/netty_parser/src/main/java/io/moquette/parser/commons/Constants.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.commons;
+package io.moquette.parser.commons;
 
 import java.io.File;
 
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java
index 40c41649..1f807ff0 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java
@@ -3,7 +3,7 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import io.moquette.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.ConnAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java
index 55496d33..248f2ddf 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.ConnAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java
index 9b8d6d60..a08d7fda 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.Attribute;
@@ -24,7 +24,7 @@ import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java
index a7d693f8..4da3c51c 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java
index 59e0ba9a..0a092f4a 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java
+++ b/netty_parser/src/main/java/io/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 io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java
index 769db766..56826d88 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java
@@ -17,7 +17,7 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java
index 5c9e33d4..34233063 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java
@@ -18,7 +18,7 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import io.moquette.proto.messages.DisconnectMessage;
+import io.moquette.parser.proto.messages.DisconnectMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java
index f601821c..de4df5cc 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.DisconnectMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.DisconnectMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java
index 322e3b15..d66ae332 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java
+++ b/netty_parser/src/main/java/io/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 io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java
index 1a6e3a30..47678be9 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java
+++ b/netty_parser/src/main/java/io/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 io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java
index f2f05975..2562e9fd 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.MessageIDMessage;
+import io.moquette.parser.proto.messages.MessageIDMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java
index bc50eb5b..2ac309ce 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PingReqMessage;
+import io.moquette.parser.proto.messages.PingReqMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java
index 52904b9d..666ad061 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PingReqMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PingReqMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java
index d4488507..b4fa5329 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java
@@ -18,7 +18,7 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import io.moquette.proto.messages.PingRespMessage;
+import io.moquette.parser.proto.messages.PingRespMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java
index 1da301e0..e000cd0f 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PingRespMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PingRespMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java
index 80f0dca1..87806ba2 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.MessageIDMessage;
-import io.moquette.proto.messages.PubAckMessage;
+import io.moquette.parser.proto.messages.MessageIDMessage;
+import io.moquette.parser.proto.messages.PubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java
index cc01f42f..52834dde 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PubAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java
index 5f4bc123..dd963bff 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.MessageIDMessage;
-import io.moquette.proto.messages.PubCompMessage;
+import io.moquette.parser.proto.messages.MessageIDMessage;
+import io.moquette.parser.proto.messages.PubCompMessage;
 
 
 /**
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java
index fe18efc4..bd76d134 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PubCompMessage;
+import io.moquette.parser.proto.messages.PubCompMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java
index 0d96336a..a7a6f7ad 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.MessageIDMessage;
-import io.moquette.proto.messages.PubRecMessage;
+import io.moquette.parser.proto.messages.MessageIDMessage;
+import io.moquette.parser.proto.messages.PubRecMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java
index de9ae61c..4adb146f 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PubRecMessage;
+import io.moquette.parser.proto.messages.PubRecMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java
index 99c430ba..a65e4366 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.MessageIDMessage;
-import io.moquette.proto.messages.PubRelMessage;
+import io.moquette.parser.proto.messages.MessageIDMessage;
+import io.moquette.parser.proto.messages.PubRelMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java
index e9dc769b..a1b62d3f 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PubRelMessage;
+import io.moquette.parser.proto.messages.PubRelMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java
index 08a5204a..ae5c68f7 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java
@@ -20,8 +20,8 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java
index 6b720aac..47775474 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.PublishMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java
index e0e1d8bc..0c870ee6 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.SubAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.SubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java
index 0e30df60..a579f970 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java
@@ -17,9 +17,9 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.AbstractMessage.QOSType;
-import io.moquette.proto.messages.SubAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.SubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java
index 6a7fd9e7..d1dfbf6f 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java
+++ b/netty_parser/src/main/java/io/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 io.moquette.proto.messages.AbstractMessage.QOSType;
-import io.moquette.proto.messages.SubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.SubscribeMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java
index e55269d0..e949b875 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.SubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.SubscribeMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java
index aa64dc9b..30638e29 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java
@@ -15,8 +15,8 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.MessageIDMessage;
-import io.moquette.proto.messages.UnsubAckMessage;
+import io.moquette.parser.proto.messages.MessageIDMessage;
+import io.moquette.parser.proto.messages.UnsubAckMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java
index 6eb565c0..d2fee6f5 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.UnsubAckMessage;
+import io.moquette.parser.proto.messages.UnsubAckMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java
index 9bdcbe05..102d659a 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java
@@ -15,12 +15,12 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.parser.proto.messages.UnsubscribeMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  *
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java
index 47c934bb..36122f0a 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java
+++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java
@@ -15,10 +15,10 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.parser.proto.messages.UnsubscribeMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 
 /**
diff --git a/netty_parser/src/main/java/io/moquette/parser/netty/Utils.java b/netty_parser/src/main/java/io/moquette/parser/netty/Utils.java
index e2c536c5..6c5820b3 100644
--- a/netty_parser/src/main/java/io/moquette/parser/netty/Utils.java
+++ b/netty_parser/src/main/java/io/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 io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/parser_commons/src/main/java/io/moquette/proto/MQTTException.java b/netty_parser/src/main/java/io/moquette/parser/proto/MQTTException.java
similarity index 96%
rename from parser_commons/src/main/java/io/moquette/proto/MQTTException.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/MQTTException.java
index ed397c8d..d05c2fc3 100644
--- a/parser_commons/src/main/java/io/moquette/proto/MQTTException.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/MQTTException.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto;
+package io.moquette.parser.proto;
 
 /**
  *
diff --git a/parser_commons/src/main/java/io/moquette/proto/Utils.java b/netty_parser/src/main/java/io/moquette/parser/proto/Utils.java
similarity index 95%
rename from parser_commons/src/main/java/io/moquette/proto/Utils.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/Utils.java
index a62c89ab..b678e194 100644
--- a/parser_commons/src/main/java/io/moquette/proto/Utils.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/Utils.java
@@ -13,9 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto;
+package io.moquette.parser.proto;
 
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 /**
  * Common utils methodd used in codecs.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/AbstractMessage.java
similarity index 98%
rename from parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/AbstractMessage.java
index 8689b62f..dab95ee7 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/AbstractMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Basic abstract message for all MQTT protocol messages.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnAckMessage.java
similarity index 97%
rename from parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnAckMessage.java
index f36b5d39..9b54a2b7 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * The attributes Qos, Dup and Retain aren't used.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnectMessage.java
similarity index 98%
rename from parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnectMessage.java
index f696b93c..515bc3a3 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnectMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * The attributes Qos, Dup and Retain aren't used for Connect message
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/DisconnectMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/DisconnectMessage.java
index 3ad9b7db..2824a84b 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/DisconnectMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Doesn't care DUP, QOS and RETAIN flags.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/MessageIDMessage.java
similarity index 96%
rename from parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/MessageIDMessage.java
index 6560d2bd..c6ab7e83 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/MessageIDMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Base class for alla the messages that carries only MessageID. (PUBACK, PUBREC,
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PingReqMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PingReqMessage.java
index ebab3d8d..1691a727 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PingReqMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Doesn't care DUP, QOS and RETAIN flags.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PingRespMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PingRespMessage.java
index fe49079e..72305a46 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PingRespMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Doesn't care DUP, QOS and RETAIN flags.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubAckMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PubAckMessage.java
index 612f4762..cb4f73d2 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Placeholder for PUBACK message.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubCompMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PubCompMessage.java
index ac415555..edce2fbe 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubCompMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  *
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRecMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRecMessage.java
index ce173000..1b80739f 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRecMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  * Placeholder for PUBREC message.
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRelMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRelMessage.java
index c3a58863..fc4319b2 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRelMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  *
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
similarity index 96%
rename from parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
index c6eadd47..2ae72431 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 import java.nio.ByteBuffer;
 
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/SubAckMessage.java
similarity index 95%
rename from parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/SubAckMessage.java
index 7034dad8..d0b3e623 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/SubAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/SubscribeMessage.java
similarity index 97%
rename from parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/SubscribeMessage.java
index 48776286..d2974f22 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/SubscribeMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubAckMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubAckMessage.java
index 2275e55e..a8d23108 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubAckMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  *
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubscribeMessage.java
similarity index 95%
rename from parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubscribeMessage.java
index 23cd03ec..1a7a2e18 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubscribeMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/ZeroLengthMessage.java
similarity index 94%
rename from parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java
rename to netty_parser/src/main/java/io/moquette/parser/proto/messages/ZeroLengthMessage.java
index 7327c0a2..f846d406 100644
--- a/parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/ZeroLengthMessage.java
@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.proto.messages;
+package io.moquette.parser.proto.messages;
 
 /**
  *
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java
index 5413f910..d97e16e9 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.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/io/moquette/parser/netty/ConnAckEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckEncoderTest.java
index 897353d9..bd79138e 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckEncoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.ConnAckMessage;
+import io.moquette.parser.proto.messages.ConnAckMessage;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java
index 6df905ff..61e35bac 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import static io.moquette.parser.netty.Utils.VERSION_3_1;
 import static io.moquette.parser.netty.Utils.VERSION_3_1_1;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java
index ceaf1925..2cf5a019 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.ConnectMessage;
+import io.moquette.parser.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java
index c9550390..1d4a20e0 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java
@@ -15,12 +15,12 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PubAckMessage;
+import io.moquette.parser.proto.messages.PubAckMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java
index 505ecb41..665d81d1 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PubAckMessage;
+import io.moquette.parser.proto.messages.PubAckMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java
index 319081b3..689c5da4 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.Before;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java
index 8e5eeade..86f565e0 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java
@@ -15,7 +15,7 @@
  */
 package io.moquette.parser.netty;
 
-import io.moquette.proto.messages.PubRelMessage;
+import io.moquette.parser.proto.messages.PubRelMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java
index 8f67408d..08b8c6fb 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.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/io/moquette/parser/netty/PublishEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java
index db711afd..40152de0 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java
@@ -23,8 +23,8 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-import io.moquette.proto.messages.AbstractMessage.QOSType;
-import io.moquette.proto.messages.PublishMessage;
+import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
+import io.moquette.parser.proto.messages.PublishMessage;
 
 /**
  *
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java
index 8f3585ec..0f208705 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.SubAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.SubAckMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java
index 036035e8..fa702953 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.SubAckMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.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/io/moquette/parser/netty/SubscribeDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java
index 3b5a932b..bfd300ed 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.SubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.SubscribeMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java
index 1578c490..bbbf83a9 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.SubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.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/io/moquette/parser/netty/UnsubscribeDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java
index 5f98d396..fc79f3ad 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java
+++ b/netty_parser/src/test/java/io/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 io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.UnsubscribeMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java
index f2a7dfc9..aa80dd8c 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.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/io/moquette/parser/netty/UtilsTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java
index 9b1b5c1e..360199fe 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import static io.moquette.parser.netty.TestUtils.verifyBuff;
 import static org.junit.Assert.*;
 
-import io.moquette.proto.messages.AbstractMessage;
-import io.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.parser.proto.messages.AbstractMessage;
+import io.moquette.parser.proto.messages.UnsubscribeMessage;
 
 /**
  *
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java b/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java
index 78b567a2..afe3c0d4 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java
@@ -1,11 +1,11 @@
 package io.moquette.parser.netty.performance;
 
-import io.moquette.proto.messages.*;
-import static io.moquette.proto.messages.AbstractMessage.*;
+import io.moquette.parser.proto.messages.*;
+import static io.moquette.parser.proto.messages.AbstractMessage.*;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.moquette.proto.Utils;
+import io.moquette.parser.proto.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java b/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
index 27e4a7df..d6cd2673 100644
--- a/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
+++ b/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
@@ -1,6 +1,6 @@
 package io.moquette.parser.netty.performance;
 
-import io.moquette.commons.Constants;
+import io.moquette.parser.commons.Constants;
 import io.moquette.parser.netty.MQTTDecoder;
 import io.moquette.parser.netty.MQTTEncoder;
 import io.netty.bootstrap.ServerBootstrap;
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
deleted file mode 100644
index cc8e5cd8..00000000
--- a/parser_commons/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <relativePath>../</relativePath>
-        <artifactId>moquette-parent</artifactId>
-        <groupId>io.moquette</groupId>
-        <version>0.9-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>moquette-parser-commons</artifactId>
-    <packaging>jar</packaging>
-    <name>Moquette - Parser Commons</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bintray.package>io.moquette.moquette-parser-commons</bintray.package>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <!-- needs extra dependencies: objenesis & hamcrest -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>  
-            <version>1.9.0</version> 
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <distributionManagement>
-        <repository>
-            <id>bintray</id>
-            <url>https://api.bintray.com/maven/${bintray.repo}/${bintray.package}</url>
-        </repository>
-    </distributionManagement>
-</project>
diff --git a/pom.xml b/pom.xml
index 252cd3af..a4ac2107 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
     </contributors>
 
     <modules>
-        <module>parser_commons</module>
         <module>netty_parser</module>
         <module>broker</module>
         <module>distribution</module>