diff --git a/broker/pom.xml b/broker/pom.xml
index dd547ca0..836769ca 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>moquette-broker</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <!--<version>${moquette-version}</version>-->
     <name>Moquette - broker</name>
 
@@ -41,20 +41,84 @@
         
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>1.7.5</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.fusesource.hawtbuf</groupId>
             <artifactId>hawtbuf</artifactId>
             <version>1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.fusesource.hawtdb</groupId>
+            <artifactId>hawtdb</artifactId>
+            <version>1.6</version>
+            <scope>provided</scope>
         </dependency>
                 
         <dependency>
@@ -107,6 +171,46 @@
                     </includes>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.1.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.dna.mqtt.commons, 
+                            org.apache.commons.logging,
+                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
+                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
+                            org.dna.mqtt.moquette.proto.messages,
+                            org.dna.mqtt.moquette.server.netty.metrics
+                        </Export-Package>
+                        <Private-Package>org.dna.mqtt.moquette.bundle,
+                            ${project.groupId}.*,
+                            com.lmax.*
+                        </Private-Package>
+                        <Import-Package>*</Import-Package>
+                        <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- Pax Runner Maven plugin -->
+                <groupId>org.ops4j</groupId>
+                <artifactId>maven-pax-plugin</artifactId>
+                <version>1.4</version>
+                <configuration>
+                    <!-- Pax Runner version -->
+                    <runner>1.4.0</runner>
+                    <!-- OSGi framework type (equinox, felix, knopflerfish) -->
+                    <framework>equinox</framework>
+                    <provision>
+                        <!--                        <param> - -log=debug</param>  
+                        <param> - -workingDirectory=target/runner</param>  -->
+                    </provision>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     
diff --git a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java b/broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
similarity index 100%
rename from bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
rename to broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
diff --git a/bundle/pom.xml b/bundle/pom.xml
deleted file mode 100644
index d46988ef..00000000
--- a/bundle/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
-        <!--<relativePath>../pom.xml</relativePath>-->
-        <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
-    </parent>
-    <artifactId>moquette-bundle</artifactId>
-
-    <packaging>bundle</packaging>
-
-    <!--<version>${moquette-version}</version>-->
-
-    <name>Moquette - bundle</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
-            <scope>provided</scope>
-        </dependency>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.dna.mqtt</groupId>
-            <artifactId>moquette-broker</artifactId>
-            <version>0.5-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-codec</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.hawtbuf</groupId>
-            <artifactId>hawtbuf</artifactId>
-            <version>1.9</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
-            <scope>provided</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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.1.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>org.dna.mqtt.commons, 
-                            org.apache.commons.logging,
-                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
-                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
-                            org.dna.mqtt.moquette.proto.messages,
-                            org.dna.mqtt.moquette.server.netty.metrics
-                        </Export-Package>
-                        <Private-Package>org.dna.mqtt.moquette.bundle,
-                            ${project.groupId}.*,
-                            com.lmax.*
-                        </Private-Package>
-                        <Import-Package>*</Import-Package>
-                        <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- Pax Runner Maven plugin -->
-                <groupId>org.ops4j</groupId>
-                <artifactId>maven-pax-plugin</artifactId>
-                <version>1.4</version>
-                <configuration>
-                    <!-- Pax Runner version -->
-                    <runner>1.4.0</runner>
-                    <!-- OSGi framework type (equinox, felix, knopflerfish) -->
-                    <framework>equinox</framework>
-                    <provision>
-                        <!--                        <param> - -log=debug</param>  
-                        <param> - -workingDirectory=target/runner</param>  -->
-                    </provision>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cd1a1d1c..44c5b19b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
         <module>netty_parser</module>
         <module>broker</module>
         <module>distribution</module>
-        <module>bundle</module>
     </modules>
     
     <reporting>