diff --git a/parser/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java b/broker/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java
rename to broker/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/server/Constants.java b/broker/src/main/java/org/dna/mqtt/moquette/server/Constants.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/server/Constants.java
rename to broker/src/main/java/org/dna/mqtt/moquette/server/Constants.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java b/broker/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java
rename to broker/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java b/broker/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
rename to broker/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/server/Server.java b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
similarity index 98%
rename from parser/src/main/java/org/dna/mqtt/moquette/server/Server.java
rename to broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
index 69647518..79d9280d 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/server/Server.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
@@ -25,8 +25,8 @@ public class Server {
     
     private static final Logger LOG = LoggerFactory.getLogger(Server.class);
     
-    public static final int PORT = 1883;
-    public static final int DEFAULT_CONNECT_TIMEOUT = 10;
+//    public static final int PORT = 1883;
+//    public static final int DEFAULT_CONNECT_TIMEOUT = 10;
     public static final String STORAGE_FILE_PATH = System.getProperty("user.home") + 
             File.separator + "moquette_store.hawtdb";
     
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMatchingCondition.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/IMatchingCondition.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMatchingCondition.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/IMatchingCondition.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/IMessaging.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/IMessaging.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/INotifier.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/INotifier.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/INotifier.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/INotifier.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/IStorageService.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IStorageService.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/IStorageService.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/HawtDBStorageService.java
similarity index 99%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/HawtDBStorageService.java
index 88e1386e..09408816 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/HawtDBStorageService.java
@@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.*;
 
 
 /**
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/SimpleMessaging.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/SimpleMessaging.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ValueEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/ValueEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ValueEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/ValueEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/DisconnectEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/DisconnectEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/DisconnectEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/DisconnectEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/InitEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/InitEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/InitEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/InitEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/MessagingEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/MessagingEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/MessagingEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/MessagingEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/NotifyEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/NotifyEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/NotifyEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/NotifyEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/ProtocolEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/ProtocolEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PubAckEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/PubAckEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PubAckEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/PubAckEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/PublishEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/PublishEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/RepublishEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/RepublishEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/RepublishEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/RepublishEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/StopEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/StopEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/StopEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/StopEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/SubscribeEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/SubscribeEvent.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/SubscribeEvent.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/events/SubscribeEvent.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/Subscription.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/Subscription.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/SubscriptionsStore.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/SubscriptionsStore.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Token.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/Token.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Token.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/Token.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java b/broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/TreeNode.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java
rename to broker/src/main/java/org/dna/mqtt/moquette/spi/impl/subscriptions/TreeNode.java
diff --git a/parser/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/DummyStorageService.java b/broker/src/test/java/org/dna/mqtt/moquette/impl/DummyStorageService.java
similarity index 100%
rename from parser/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/DummyStorageService.java
rename to broker/src/test/java/org/dna/mqtt/moquette/impl/DummyStorageService.java
diff --git a/parser/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessagingTest.java b/broker/src/test/java/org/dna/mqtt/moquette/impl/SimpleMessagingTest.java
similarity index 100%
rename from parser/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessagingTest.java
rename to broker/src/test/java/org/dna/mqtt/moquette/impl/SimpleMessagingTest.java
diff --git a/parser/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java b/broker/src/test/java/org/dna/mqtt/moquette/impl/subscriptions/SubscriptionsStoreTest.java
similarity index 100%
rename from parser/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
rename to broker/src/test/java/org/dna/mqtt/moquette/impl/subscriptions/SubscriptionsStoreTest.java
diff --git a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java b/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java
similarity index 100%
rename from parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java
rename to broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java
diff --git a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java b/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java
similarity index 99%
rename from parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java
rename to broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java
index aa294aa2..f6fce7d0 100644
--- a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java
@@ -7,7 +7,6 @@ import java.util.concurrent.TimeUnit;
 import org.dna.mqtt.moquette.client.Client;
 import org.dna.mqtt.moquette.client.IPublishCallback;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
-import org.fusesource.mqtt.client.*;
 import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;