diff --git a/.gitignore b/.gitignore
index 51f97fcd..b00a78f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .idea/
 *.iml
 broker/target/
+client/target/
diff --git a/broker/pom.xml b/broker/pom.xml
index 449577b2..9f413506 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -78,6 +78,13 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.dna.mqtt</groupId>
+            <artifactId>moquette-client</artifactId>
+            <version>0.1</version>
+            <scope>test</scope>
+        </dependency>
         
         <dependency>
             <groupId>org.fusesource.hawtbuf</groupId>
diff --git a/client/pom.xml b/client/pom.xml
new file mode 100644
index 00000000..718d8fed
--- /dev/null
+++ b/client/pom.xml
@@ -0,0 +1,98 @@
+
+<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>0.1</version>
+    </parent>
+
+    <artifactId>moquette-client</artifactId>
+    <packaging>jar</packaging>
+    <version>0.1</version>
+    <name>Moquette - client</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dna.mqtt</groupId>
+            <artifactId>moquette-parser</artifactId>
+            <version>0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        
+        <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>
+    
+    <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>
+            
+            
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.dna.mqtt.moquette.client.Main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+
+            
+        </plugins>
+    </build>
+</project>
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/client/Client.java b/client/src/main/java/org/dna/mqtt/moquette/client/Client.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/client/Client.java
rename to client/src/main/java/org/dna/mqtt/moquette/client/Client.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java b/client/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java
rename to client/src/main/java/org/dna/mqtt/moquette/client/ClientMQTTHandler.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/client/IPublishCallback.java b/client/src/main/java/org/dna/mqtt/moquette/client/IPublishCallback.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/client/IPublishCallback.java
rename to client/src/main/java/org/dna/mqtt/moquette/client/IPublishCallback.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/client/Main.java b/client/src/main/java/org/dna/mqtt/moquette/client/Main.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/client/Main.java
rename to client/src/main/java/org/dna/mqtt/moquette/client/Main.java
diff --git a/parser/pom.xml b/parser/pom.xml
index 2788e78d..d24f53d6 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -100,23 +100,7 @@
                     </excludes>
                 </configuration>
             </plugin>
-            
-            
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.dna.mqtt.moquette.server.Server</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
 
-            
         </plugins>
     </build>
     
diff --git a/pom.xml b/pom.xml
index 2aed6111..8327ce90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <modules>
         <module>parser</module>
         <module>broker</module>
+        <module>client</module>
         <module>benchmarking</module>
     </modules>