diff --git a/.gitignore b/.gitignore
index a6f89c2d..d639c352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/target/
\ No newline at end of file
+/target/
+/parser/target/
\ No newline at end of file
diff --git a/docs/MQTT_V3.1_Protocol_Specific.pdf b/parser/docs/MQTT_V3.1_Protocol_Specific.pdf
similarity index 100%
rename from docs/MQTT_V3.1_Protocol_Specific.pdf
rename to parser/docs/MQTT_V3.1_Protocol_Specific.pdf
diff --git a/docs/Notes.txt b/parser/docs/Notes.txt
similarity index 100%
rename from docs/Notes.txt
rename to parser/docs/Notes.txt
diff --git a/parser/pom.xml b/parser/pom.xml
new file mode 100644
index 00000000..cbe21c28
--- /dev/null
+++ b/parser/pom.xml
@@ -0,0 +1,73 @@
+
+<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>../pom.xml</relativePath>
+        <artifactId>moquette-parent</artifactId>
+        <groupId>org.dna.mqtt</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>moquette-parser</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Moquette - Parser</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</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>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/org/dna/mqtt/moquette/client/Client.java b/parser/src/main/java/org/dna/mqtt/moquette/client/Client.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/client/Client.java
rename to parser/src/main/java/org/dna/mqtt/moquette/client/Client.java
diff --git a/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java b/parser/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java
rename to parser/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java
diff --git a/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
rename to parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/ConnAckDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/ConnAckDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/ConnAckDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/ConnAckDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/ConnAckEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/ConnAckEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/ConnAckEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/ConnAckEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/ConnectDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/ConnectDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/ConnectDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/ConnectDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/ConnectEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/ConnectEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/ConnectEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/ConnectEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/DisconnectDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/DisconnectDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/DisconnectDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/DisconnectDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/DisconnectEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/DisconnectEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/DisconnectEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/DisconnectEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/MessageIDDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/MessageIDDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/MessageIDDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/MessageIDDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/MqttDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/MqttDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/MqttDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/MqttDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PingReqDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PingReqDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PingReqDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PingReqDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PingReqEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PingReqEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PingReqEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PingReqEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PingRespDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PingRespDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PingRespDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PingRespDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PingRespEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PingRespEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PingRespEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PingRespEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubAckDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubAckDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubAckDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubAckDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubAckEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubAckEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubAckEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubAckEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubRecDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubRecDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubRecDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubRecDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubRecEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubRecEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubRecEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubRecEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubRelDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubRelDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubRelDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubRelDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PubRelEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubRelEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PubRelEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PubRelEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PublishDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PublishDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PublishDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PublishDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/PublishEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PublishEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/PublishEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/PublishEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/SubAckDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/SubAckDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/SubAckDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/SubAckDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/SubAckEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/SubAckEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/SubAckEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/SubAckEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/SubscribeDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/SubscribeDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/SubscribeDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/SubscribeDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/SubscribeEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/SubscribeEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/SubscribeEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/SubscribeEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/UnsubAckDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubAckDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/UnsubAckDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubAckDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/UnsubAckEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubAckEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/UnsubAckEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubAckEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoder.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoder.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoder.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/Utils.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/Utils.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/Utils.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/Utils.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
rename to parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
diff --git a/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java b/parser/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java
rename to parser/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java
diff --git a/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java b/parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
rename to parser/src/main/java/org/dna/mqtt/moquette/server/MQTTHandler.java
diff --git a/src/main/java/org/dna/mqtt/moquette/server/Server.java b/parser/src/main/java/org/dna/mqtt/moquette/server/Server.java
similarity index 100%
rename from src/main/java/org/dna/mqtt/moquette/server/Server.java
rename to parser/src/main/java/org/dna/mqtt/moquette/server/Server.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/ConnAckDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/ConnAckDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/ConnAckDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/ConnAckDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/ConnAckEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/ConnAckEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/ConnAckEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/ConnAckEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/ConnectDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/ConnectDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/ConnectDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/ConnectDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/ConnectEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/ConnectEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/ConnectEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/ConnectEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/PubAckDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/PubAckDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/PubAckDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/PubAckDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/PubAckEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/PubAckEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/PubAckEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/PubAckEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/PublishDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/PublishDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/PublishDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/PublishDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/PublishEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/PublishEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/PublishEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/PublishEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/SubAckDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/SubAckDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/SubAckDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/SubAckDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/SubAckEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/SubAckEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/SubAckEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/SubAckEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/SubscribeDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/SubscribeDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/SubscribeDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/SubscribeDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/SubscribeEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/SubscribeEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/SubscribeEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/SubscribeEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/TestUtils.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/TestUtils.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/TestUtils.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/TestUtils.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeDecoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoderTest.java b/parser/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoderTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoderTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoderTest.java
diff --git a/src/test/java/org/dna/mqtt/moquette/server/MQTTHandlerTest.java b/parser/src/test/java/org/dna/mqtt/moquette/server/MQTTHandlerTest.java
similarity index 100%
rename from src/test/java/org/dna/mqtt/moquette/server/MQTTHandlerTest.java
rename to parser/src/test/java/org/dna/mqtt/moquette/server/MQTTHandlerTest.java
diff --git a/pom.xml b/pom.xml
index 484d19a0..85199be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,69 +2,17 @@
 <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>
-
-    <groupId>org.dna.mqtt</groupId>
-    <artifactId>moquette</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>Moquette MQTT library</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <version>2.0.4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</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>
     
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <groupId>org.dna.mqtt</groupId>
+    <artifactId>moquette-parent</artifactId>
+
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Moquette MQTT library</name>
+    <url>http://code.google.com/p/moquette-mqtt/</url>
+
+    <modules>
+        <module>parser</module>
+    </modules>
+
 </project>